Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java

@@ -41,11 +41,6 @@ import java.util.List;
 public class ScreeningController {
     @Resource
     private IScreeningService screeningService;
-    @Resource
-    private DmsTenantMapper dmsTenantMapper;
-
-    @Resource
-    private UmsDataSourceMapper umsDataSourceMapper;
 
     @ApiOperation(value = "查询筛查列表", notes = "原:查询医院是否填写了调查筛查")
     @RequestMapping(value = "/queryDetail", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})

acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/ScreeningDto.java

@@ -287,6 +287,11 @@ public class ScreeningDto {
         private Long tenantId;
 
         private Long centerId;
+
+        //用以下两个参数判断是否筛查过，如筛查过返回旧筛查ID，没有才创建新的筛查
+        private String name;
+        private String phone;
+
     }
 
     @Data

acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/ExternalVo.java

@@ -33,6 +33,16 @@ public class ExternalVo {
 
         private String weight;
         private String phone;
+
+        public String getSex() {
+            if ("0".equals(sex)) {
+                return "1";
+            }
+            if ("1".equals(sex)) {
+                return "2";
+            }
+            return sex;
+        }
     }
 
     @Data

acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ScreeningServiceImpl.java

@@ -360,10 +360,13 @@ public class ScreeningServiceImpl implements IScreeningService {
             redisCache.set(param.getDetailId() + "" + userId + param.getCode(), userId, 600);
             //查询是否已经提交,已提交不能保存修改
             ScrScreeningRecord questionnaireDetail = scrScreeningRecordMapper.selectByPrimaryKey(param.getDetailId());
-            if (UserConstants.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) {
-                redisCache.deleteObject(param.getDetailId() + "" + userId + param.getCode());
-                throw new BaseException(ErrorConstant.HOSPITAL_REPEAT_SUBMIT);
+            if (questionnaireDetail == null) {
+                return;
             }
+//            if (UserConstants.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) {
+//                redisCache.deleteObject(param.getDetailId() + "" + userId + param.getCode());
+//                throw new BaseException(ErrorConstant.HOSPITAL_REPEAT_SUBMIT);
+//            }
 
             log.info("param.getCode():{}", param.getCode());
             if (param.getCode().equals("SCWJ-NAME")) {

acupuncture-system/src/main/resources/mapper/dao/ScreeningDetailDao.xml

@@ -102,6 +102,9 @@
             <if test="param.phone != null and param.phone != ''">
                 and r.phone = #{param.phone}
             </if>
+            <if test="param.name != null and param.name != ''">
+                and r.name = #{param.name}
+            </if>
         </where>
 --         group by r.id
         order by r.create_time desc