jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e7097ac85d5fe596d43cbded002262aaf6b33a54

Authored by zhangchao
1 parent 5e59f40433
Exists in dev

#fix:优化儿童体重计算方式

Showing 6 changed files with 92 additions and 88 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ e7097ac
... ... @@ -109,7 +109,7 @@
109 109 }
110 110  
111 111 public static void main(String[] args) {
112   - System.out.println((hasSameCharacters("15,16,17","18,19,20,21")));
  112 + System.out.println(cutBabyWeight("11"));
113 113 }
114 114  
115 115  
116 116  
... ... @@ -140,10 +140,10 @@
140 140 }
141 141 StringBuilder stringBuilder = new StringBuilder(babyWeight);
142 142  
143   - if (babyWeight.length() > 2) {
  143 + /* if (babyWeight.length() > 2) {
144 144 stringBuilder.setLength(babyWeight.length() - 1);
145   - }
146   - stringBuilder.insert(stringBuilder.length() - 2, ".");
  145 + }*/
  146 + stringBuilder.insert(stringBuilder.length() - 3, ".");
147 147 return stringBuilder.toString();
148 148 }
149 149  
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ e7097ac
... ... @@ -525,15 +525,6 @@
525 525 //病历号(住院号)
526 526 private String blNo;
527 527  
528   - private String deptName;//患者所属科室名称
529   -
530   - public String getDeptName() {
531   - return deptName;
532   - }
533   -
534   - public void setDeptName(String deptName) {
535   - this.deptName = deptName;
536   - }
537 528  
538 529 public String getBlNo() {
539 530 return blNo;
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ e7097ac
... ... @@ -447,16 +447,8 @@
447 447 private boolean isArchive=false;
448 448 //病历号(住院号)
449 449 private String blNo;
450   - private String deptName;//患者所属科室名称
451 450  
452   - public String getDeptName() {
453   - return deptName;
454   - }
455 451  
456   - public void setDeptName(String deptName) {
457   - this.deptName = deptName;
458   - }
459   -
460 452 public String getBlNo() {
461 453 return blNo;
462 454 }
... ... @@ -807,9 +799,7 @@
807 799 if (StringUtils.isNotEmpty(blNo)){
808 800 condition = condition.and("blNo", blNo, MongoOper.IS);
809 801 }
810   - if (StringUtils.isNotEmpty(deptName)){
811   - condition = condition.and("deptName", deptName, MongoOper.IS);
812   - }
  802 +
813 803 if (null != isComplete) {
814 804 condition = condition.and("isComplete", isComplete, MongoOper.IS);
815 805 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ e7097ac
... ... @@ -1044,8 +1044,8 @@
1044 1044 int dueDay = day % 7;
1045 1045 babyModel1.setDueDay(dueDay == 0 ? null : dueDay);
1046 1046 }
1047   - babyModel1.setBabyHeight(baby.getBabyHeight());
1048   - babyModel1.setBabyWeight(baby.getBabyWeight());
  1047 + /* babyModel1.setBabyHeight(baby.getBabyHeight());
  1048 + babyModel1.setBabyWeight(baby.getBabyWeight());*/
1049 1049  
1050 1050 babyModel1.setDeliverOrg(deliverAddRequest.getFmHospital());
1051 1051 babyModel1.setBirth(DateUtil.parseYMDHM(baby.getDueTime()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ e7097ac
... ... @@ -15,10 +15,7 @@
15 15 import com.lyms.platform.permission.model.*;
16 16 import com.lyms.platform.permission.service.*;
17 17 import com.lyms.platform.pojo.*;
18   -import com.lyms.platform.query.BabyModelQuery;
19   -import com.lyms.platform.query.BasicConfigQuery;
20   -import com.lyms.platform.query.PatientsQuery;
21   -import com.lyms.platform.query.TServiceTimeRecordQuery;
  18 +import com.lyms.platform.query.*;
22 19 import net.sf.json.JSONObject;
23 20 import org.apache.commons.collections.CollectionUtils;
24 21 import org.slf4j.Logger;
... ... @@ -85,6 +82,8 @@
85 82 @Autowired
86 83 private SmsConfigFacade smsConfigFacade;
87 84 @Autowired
  85 + private MatDeliverService matDeliverService;
  86 + @Autowired
88 87 @Qualifier("commonThreadPool")
89 88 private ThreadPoolTaskExecutor commonThreadPool;
90 89  
... ... @@ -1893,7 +1892,8 @@
1893 1892  
1894 1893 public BaseResponse updatePuerpera(BirthResult birthResult){
1895 1894 BaseResponse baseResponse = new BaseResponse();
1896   - if (StringUtils.isEmpty(birthResult.getParentId())){
  1895 + String parentId=birthResult.getParentId();
  1896 + if (StringUtils.isEmpty(parentId)){
1897 1897 baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
1898 1898 baseResponse.setErrormsg("数据异常");
1899 1899 return baseResponse;
1900 1900  
1901 1901  
1902 1902  
1903 1903  
1904 1904  
... ... @@ -1906,69 +1906,92 @@
1906 1906 }*/
1907 1907 Patients patients=new Patients();
1908 1908 BeanUtils.copy(birthResult, patients);
1909   - patients.setId(birthResult.getParentId());
  1909 + patients.setId(parentId);
1910 1910 patientsService.updatePatient(patients);
1911 1911 List<BirthBabyResult> babyResults= birthResult.getResultList();
1912 1912 if (CollectionUtils.isNotEmpty(babyResults)){
1913   - for (BirthBabyResult birthBaby:babyResults){
1914   - BabyModel babyModel=new BabyModel();
1915   - if (StringUtils.isEmpty(birthBaby.getBabyId())){
1916   - // babyModel=getBabyModel(babyModel,mPatients);
1917   - }else {
1918   - babyModel.setId(birthBaby.getBabyId());
  1913 + MatDeliverQuery deliverQuery=new MatDeliverQuery();
  1914 + deliverQuery.setYn(1);
  1915 + deliverQuery.setParentId(parentId);
  1916 + List<MaternalDeliverModel> modelList= matDeliverService.query(deliverQuery);
  1917 + if (CollectionUtils.isNotEmpty(modelList)){
  1918 + MaternalDeliverModel maternalDeliverModel= modelList.get(0);
  1919 + List<MaternalDeliverModel.Baby> babyList=maternalDeliverModel.getBaby();
  1920 + //List<MaternalDeliverModel.Baby> babyList1=new ArrayList<>();
  1921 + for (int i=0,j=babyResults.size();i<j;i++){
  1922 + BirthBabyResult birthBaby=babyResults.get(i);
  1923 + MaternalDeliverModel.Baby baby= babyList.get(i);
  1924 + BabyModel babyModel=new BabyModel();
  1925 + if (StringUtils.isEmpty(birthBaby.getBabyId())){
  1926 + // babyModel=getBabyModel(babyModel,mPatients);
  1927 + }else {
  1928 + babyModel.setId(birthBaby.getBabyId());
  1929 + }
  1930 + if (StringUtils.isNotEmpty(birthBaby.getBabyWeek())){
  1931 + babyModel.setWeek(birthBaby.getBabyWeek());
  1932 + }
  1933 + if (StringUtils.isNotEmpty(birthBaby.getBabyHeight())){
  1934 + babyModel.setBabyHeight(birthBaby.getBabyHeight());
  1935 + baby.setBabyHeight(birthBaby.getBabyHeight());
  1936 + }
  1937 + if (StringUtils.isNotEmpty(birthBaby.getBabyWeight())){
  1938 + //把克转换为千克
  1939 + babyModel.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(birthBaby.getBabyWeight()));
  1940 + baby.setBabyWeight(birthBaby.getBabyWeight());
  1941 + }
  1942 + if (StringUtils.isNotEmpty(birthBaby.getDeliverOrg())){
  1943 + babyModel.setDeliverOrg(birthBaby.getDeliverOrg());
  1944 + }
  1945 + if (birthBaby.getBabySex()!=null){
  1946 + babyModel.setSex(birthBaby.getBabySex());
  1947 + baby.setBabyGender(String.valueOf(birthBaby.getBabySex()));
  1948 + }
  1949 + if (StringUtils.isNotEmpty(birthBaby.getBabyName())){
  1950 + babyModel.setName(birthBaby.getBabyName());
  1951 + baby.setXsexm(birthBaby.getBabyName());
  1952 + }
  1953 + if (StringUtils.isNotEmpty(birthBaby.getFirstName())){
  1954 + babyModel.setFirstName(birthBaby.getFirstName());
  1955 + }
  1956 + if (StringUtils.isNotEmpty(birthBaby.getLastName())){
  1957 + babyModel.setLastName(birthBaby.getLastName());
  1958 + }
  1959 + if (StringUtils.isNotEmpty(birthBaby.getBabyAddress())){
  1960 + babyModel.setBabyAddress(birthBaby.getBabyAddress());
  1961 + }
  1962 + if(StringUtils.isNotEmpty(birthBaby.getBabyStreetId())){
  1963 + babyModel.setBabyStreetId(birthBaby.getBabyStreetId());
  1964 + }
  1965 + if (StringUtils.isNotEmpty(birthBaby.getBabyProvinceId())){
  1966 + babyModel.setBabyProvinceId(birthBaby.getBabyProvinceId());
  1967 + }
  1968 + if (StringUtils.isNotEmpty(birthBaby.getBabyCityId())){
  1969 + babyModel.setBabyCityId(birthBaby.getBabyCityId());
  1970 + }
  1971 + if (StringUtils.isNotEmpty(birthBaby.getBabyAreaId())){
  1972 + babyModel.setBabyAreaId(birthBaby.getBabyAreaId());
  1973 + }
  1974 + if(StringUtils.isNotEmpty(birthBaby.getBabyVillageId())){
  1975 + babyModel.setBabyVillageId(birthBaby.getBabyVillageId());
  1976 + }
  1977 + if (StringUtils.isNotEmpty(birthBaby.getBlNo())){
  1978 + babyModel.setBlNo(birthBaby.getBlNo());
  1979 + baby.setBlNo(birthBaby.getBlNo());
  1980 + }
  1981 + if (StringUtils.isEmpty(babyModel.getId())){
  1982 + // babyService.addOneBaby(babyModel);
  1983 + }else {
  1984 + babyService.updateOneBaby(babyModel,babyModel.getId());
  1985 + //babyList1.add(baby);
  1986 + babyList.set(i,baby);
  1987 + }
1919 1988 }
1920   - if (StringUtils.isNotEmpty(birthBaby.getBabyWeek())){
1921   - babyModel.setWeek(birthBaby.getBabyWeek());
  1989 + if (CollectionUtils.isNotEmpty(babyList)){
  1990 + maternalDeliverModel.setBaby(babyList);
  1991 + matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId());
1922 1992 }
1923   - if (StringUtils.isNotEmpty(birthBaby.getBabyHeight())){
1924   - babyModel.setBabyHeight(birthBaby.getBabyHeight());
1925 1993 }
1926   - if (StringUtils.isNotEmpty(birthBaby.getBabyWeight())){
1927   - babyModel.setBabyWeight(birthBaby.getBabyWeight());
1928   - }
1929   - if (StringUtils.isNotEmpty(birthBaby.getDeliverOrg())){
1930   - babyModel.setDeliverOrg(birthBaby.getDeliverOrg());
1931   - }
1932   - if (birthBaby.getBabySex()!=null){
1933   - babyModel.setSex(birthBaby.getBabySex());
1934   - }
1935   - if (StringUtils.isNotEmpty(birthBaby.getBabyName())){
1936   - babyModel.setName(birthBaby.getBabyName());
1937   - }
1938   - if (StringUtils.isNotEmpty(birthBaby.getFirstName())){
1939   - babyModel.setFirstName(birthBaby.getFirstName());
1940   - }
1941   - if (StringUtils.isNotEmpty(birthBaby.getLastName())){
1942   - babyModel.setLastName(birthBaby.getLastName());
1943   - }
1944   - if (StringUtils.isNotEmpty(birthBaby.getBabyAddress())){
1945   - babyModel.setBabyAddress(birthBaby.getBabyAddress());
1946   - }
1947   - if(StringUtils.isNotEmpty(birthBaby.getBabyStreetId())){
1948   - babyModel.setBabyStreetId(birthBaby.getBabyStreetId());
1949   - }
1950   - if (StringUtils.isNotEmpty(birthBaby.getBabyProvinceId())){
1951   - babyModel.setBabyProvinceId(birthBaby.getBabyProvinceId());
1952   - }
1953   - if (StringUtils.isNotEmpty(birthBaby.getBabyCityId())){
1954   - babyModel.setBabyCityId(birthBaby.getBabyCityId());
1955   - }
1956   - if (StringUtils.isNotEmpty(birthBaby.getBabyAreaId())){
1957   - babyModel.setBabyAreaId(birthBaby.getBabyAreaId());
1958   - }
1959   - if(StringUtils.isNotEmpty(birthBaby.getBabyVillageId())){
1960   - babyModel.setBabyVillageId(birthBaby.getBabyVillageId());
1961   - }
1962   - if (StringUtils.isNotEmpty(birthBaby.getBlNo())){
1963   - babyModel.setBlNo(birthBaby.getBlNo());
1964   - }
1965   - if (StringUtils.isEmpty(babyModel.getId())){
1966   - // babyService.addOneBaby(babyModel);
1967   - }else {
1968   - babyService.updateOneBaby(babyModel,babyModel.getId());
1969   - }
1970 1994 }
1971   - }
1972 1995  
1973 1996 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1974 1997 baseResponse.setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ e7097ac
... ... @@ -59,7 +59,7 @@
59 59 //urls.put("area-rongcheng-api.healthbaby.com.cn:12356","荣成");
60 60 //urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院");
61 61 //urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼");
62   - urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
  62 + //urls.put("area-chengde-api.healthbaby.com.cn:12356","承德");
63 63 urls.put("area-nanhe-api.healthbaby.com.cn:12356","南和");
64 64 urls.put("area-dt-api.healthbaby.com.cn:12356","大同");
65 65 //urls.put("area-lingcheng-api.healthbaby.com.cn:12356","陵城");