fix: 结算税源地

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -44,6 +44,7 @@ import com.qunzhixinxi.hnqz.admin.entity.model.excel.BatchPackageExcelModel;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageTypeEnum;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
@@ -2596,7 +2597,7 @@ public class WmScorePackageController {
 			}
 		}
 
-		if (wmScorePackage.getSubjectLocation() != null){
+		if (wmScorePackage.getSubjectLocation() != null && !SubjectLocation.NULL.equals(wmScorePackage.getSubjectLocation())){
 			wmScorePackage.setSubType(String.valueOf(wmScorePackage.getSubjectLocation().getGigType().getCode()));
 		}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SubjectLocation.java

@@ -14,6 +14,8 @@ import java.util.List;
 @AllArgsConstructor
 public enum SubjectLocation {
 
+	NULL("", null, "非必填", -1),
+
 	// 仁励家通道
 	REN_LI_JIA("REN_LI_JIA", GigTypeEnum.REN_LI_JIA, "仁励家", 0),
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -1457,6 +1457,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				if (StringUtils.isBlank(ouPut.getSettleStatus())) {
 					ouPut.setSettleStatus(String.valueOf(settleNote.getSettleNoteStatus()));
 				}
+				ouPut.setSubjectLocation(settleNote.getSubjectLocation());
 			}
 			if (PackageTypeEnum.TYPE1_HCP_PACKAGE.val().equals(ouPut.getPackageType1())) {
 				// 如果是患者教育，则转换积分值 '分'->'元'

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1425,7 +1425,6 @@
 		       p.package_type2,
 		       p.sub_type,
 		       p.source_type,
-		       p.subject_location,
 		       p.oms_order_sn
 		FROM wm_score_package p, sys_dept d
 		WHERE