diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index 8ce7c48..f98ae47 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -109,7 +109,7 @@ public final class StringUtils { } public static void main(String[] args) { - System.out.println((hasSameCharacters("15,16,17","18,19,20,21"))); + System.out.println(cutBabyWeight("11")); } @@ -140,10 +140,10 @@ public final class StringUtils { } StringBuilder stringBuilder = new StringBuilder(babyWeight); - if (babyWeight.length() > 2) { + /* if (babyWeight.length() > 2) { stringBuilder.setLength(babyWeight.length() - 1); - } - stringBuilder.insert(stringBuilder.length() - 2, "."); + }*/ + stringBuilder.insert(stringBuilder.length() - 3, "."); return stringBuilder.toString(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 8aead46..18c4cbb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -525,15 +525,6 @@ public class Patients extends BaseModel { //病历号(住院号) private String blNo; - private String deptName;//患者所属科室名称 - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } public String getBlNo() { return blNo; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index d603e60..5ceaed2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -447,15 +447,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private boolean isArchive=false; //病历号(住院号) private String blNo; - private String deptName;//患者所属科室名称 - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } public String getBlNo() { return blNo; @@ -807,9 +799,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(blNo)){ condition = condition.and("blNo", blNo, MongoOper.IS); } - if (StringUtils.isNotEmpty(deptName)){ - condition = condition.and("deptName", deptName, MongoOper.IS); - } + if (null != isComplete) { condition = condition.and("isComplete", isComplete, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 229266e..d5c470c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1044,8 +1044,8 @@ public class MatDeliverFacade { int dueDay = day % 7; babyModel1.setDueDay(dueDay == 0 ? null : dueDay); } - babyModel1.setBabyHeight(baby.getBabyHeight()); - babyModel1.setBabyWeight(baby.getBabyWeight()); + /* babyModel1.setBabyHeight(baby.getBabyHeight()); + babyModel1.setBabyWeight(baby.getBabyWeight());*/ babyModel1.setDeliverOrg(deliverAddRequest.getFmHospital()); babyModel1.setBirth(DateUtil.parseYMDHM(baby.getDueTime())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 5ebd063..256f2ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -15,10 +15,7 @@ import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.BasicConfigQuery; -import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.TServiceTimeRecordQuery; +import com.lyms.platform.query.*; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; @@ -85,6 +82,8 @@ public class PatientServiceFacade { @Autowired private SmsConfigFacade smsConfigFacade; @Autowired + private MatDeliverService matDeliverService; + @Autowired @Qualifier("commonThreadPool") private ThreadPoolTaskExecutor commonThreadPool; @@ -1893,7 +1892,8 @@ public class PatientServiceFacade { public BaseResponse updatePuerpera(BirthResult birthResult){ BaseResponse baseResponse = new BaseResponse(); - if (StringUtils.isEmpty(birthResult.getParentId())){ + String parentId=birthResult.getParentId(); + if (StringUtils.isEmpty(parentId)){ baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); baseResponse.setErrormsg("数据异常"); return baseResponse; @@ -1906,69 +1906,92 @@ public class PatientServiceFacade { }*/ Patients patients=new Patients(); BeanUtils.copy(birthResult, patients); - patients.setId(birthResult.getParentId()); + patients.setId(parentId); patientsService.updatePatient(patients); List babyResults= birthResult.getResultList(); if (CollectionUtils.isNotEmpty(babyResults)){ - for (BirthBabyResult birthBaby:babyResults){ - BabyModel babyModel=new BabyModel(); - if (StringUtils.isEmpty(birthBaby.getBabyId())){ - // babyModel=getBabyModel(babyModel,mPatients); - }else { - babyModel.setId(birthBaby.getBabyId()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyWeek())){ - babyModel.setWeek(birthBaby.getBabyWeek()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyHeight())){ - babyModel.setBabyHeight(birthBaby.getBabyHeight()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyWeight())){ - babyModel.setBabyWeight(birthBaby.getBabyWeight()); - } - if (StringUtils.isNotEmpty(birthBaby.getDeliverOrg())){ - babyModel.setDeliverOrg(birthBaby.getDeliverOrg()); - } - if (birthBaby.getBabySex()!=null){ - babyModel.setSex(birthBaby.getBabySex()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyName())){ - babyModel.setName(birthBaby.getBabyName()); - } - if (StringUtils.isNotEmpty(birthBaby.getFirstName())){ - babyModel.setFirstName(birthBaby.getFirstName()); - } - if (StringUtils.isNotEmpty(birthBaby.getLastName())){ - babyModel.setLastName(birthBaby.getLastName()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyAddress())){ - babyModel.setBabyAddress(birthBaby.getBabyAddress()); - } - if(StringUtils.isNotEmpty(birthBaby.getBabyStreetId())){ - babyModel.setBabyStreetId(birthBaby.getBabyStreetId()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyProvinceId())){ - babyModel.setBabyProvinceId(birthBaby.getBabyProvinceId()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyCityId())){ - babyModel.setBabyCityId(birthBaby.getBabyCityId()); - } - if (StringUtils.isNotEmpty(birthBaby.getBabyAreaId())){ - babyModel.setBabyAreaId(birthBaby.getBabyAreaId()); - } - if(StringUtils.isNotEmpty(birthBaby.getBabyVillageId())){ - babyModel.setBabyVillageId(birthBaby.getBabyVillageId()); + MatDeliverQuery deliverQuery=new MatDeliverQuery(); + deliverQuery.setYn(1); + deliverQuery.setParentId(parentId); + List modelList= matDeliverService.query(deliverQuery); + if (CollectionUtils.isNotEmpty(modelList)){ + MaternalDeliverModel maternalDeliverModel= modelList.get(0); + List babyList=maternalDeliverModel.getBaby(); + //List babyList1=new ArrayList<>(); + for (int i=0,j=babyResults.size();i