修改病史信息可以为空

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/PmsPatientDto.java

@@ -288,6 +288,8 @@ public class PmsPatientDto {
 
         @ApiModelProperty("就诊号")
         private String visitNo;
+        @ApiModelProperty("病人id")
+        private Long patientId;
         @ApiModelProperty("类型")
         @NotNull(message = "病人类型不能为空")
         private String editType;

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/PmsPatientServiceImpl.java

@@ -378,14 +378,20 @@ public class PmsPatientServiceImpl implements IPmsPatientService {
         String visitNo = param.getVisitNo();
         if (StrUtil.isEmpty(visitNo)) {
             visitNo = jsonObject.getString("visitNo");
+            if ("PmsPatientBody".equals(param.getEditType())) {
+                visitNo = jsonObject.getString("outpatientNo");
+            }
             if (StrUtil.isEmpty(visitNo)) {
                 throw new ServiceException("就诊号不能为空");
             }
         }
         //验证患者id是否为空
-        Long patientId = jsonObject.getLong("patientId");
+        Long patientId = param.getPatientId();
         if (patientId == null) {
-            throw new ServiceException("患者id不能为空");
+            patientId = jsonObject.getLong("patientId");
+            if (patientId == null) {
+                throw new ServiceException("患者id不能为空");
+            }
         }