jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f07e62fe5b8d826ac3948dd7b7b9b31932028d20

Authored by liquanyu
1 parent bdd5f334fc
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update code

Showing 5 changed files with 251 additions and 154 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ f07e62f
... ... @@ -129,7 +129,7 @@
129 129 @RequestMapping(value = "/queryPremaritalCheckupPage/{id}", method = RequestMethod.GET)
130 130 @ResponseBody
131 131 @TokenRequired
132   - public BaseObjectResponse queryPremaritalCheckup(@RequestParam("id") String id,
  132 + public BaseObjectResponse queryPremaritalCheckup(@PathVariable("id") String id,
133 133 HttpServletRequest request){
134 134 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
135 135 return premaritalCheckupFacade.queryPremaritalCheckupPage(id, loginState.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ f07e62f
... ... @@ -21,6 +21,7 @@
21 21 import com.lyms.platform.operate.web.result.PremaritalCheckupResult;
22 22 import com.lyms.platform.operate.web.utils.CommonsHelper;
23 23 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
  24 +import com.lyms.platform.operate.web.utils.UnitConstants;
24 25 import com.lyms.platform.permission.model.Organization;
25 26 import com.lyms.platform.permission.model.Users;
26 27 import com.lyms.platform.permission.service.OrganizationService;
... ... @@ -1757,9 +1758,6 @@
1757 1758 }
1758 1759 checkupResult.setIsBloodshed(isBloodshed);
1759 1760  
1760   -
1761   -
1762   -
1763 1761 checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
1764 1762 String hunJianDoctor = "";
1765 1763 if (result.getHunJianDoctor()!=null){
... ... @@ -1798,7 +1796,7 @@
1798 1796 checkupResult.setRenLiu(result.getRenLiu()+"次");
1799 1797 }
1800 1798  
1801   - String maritalHistory = null;
  1799 + String maritalHistory = "";
1802 1800 if (result.getMaritalHistory() != null && 1 == result.getMaritalHistory())
1803 1801 {
1804 1802 maritalHistory+="有";
... ... @@ -1855,7 +1853,7 @@
1855 1853 nextOfKin = "无";
1856 1854 }
1857 1855 checkupResult.setNextOfKin(nextOfKin);
1858   - checkupResult.setChildrenNum(result.getChildrenNum() + "人");
  1856 + checkupResult.setChildrenNum(result.getChildrenNum() == null ? "" : result.getChildrenNum()+UnitConstants.REN);
1859 1857  
1860 1858  
1861 1859  
... ... @@ -2026,7 +2024,7 @@
2026 2024 }
2027 2025 if (StringUtils.isNotEmpty(content))
2028 2026 {
2029   - maoFa+=content;
  2027 + jiZhu+=content;
2030 2028 }
2031 2029 }
2032 2030 if (result.getJiZhu() != null && result.getJiZhu() == 2)
2033 2031  
... ... @@ -2037,10 +2035,18 @@
2037 2035 checkupResult.setQianBiaoLinBaJie(result.getQianBiaoLinBaJie());
2038 2036  
2039 2037 //视力
2040   - checkupResult.setShiLi(result.getShiLiZuo() + "/" + result.getShiLiYou());
2041   - checkupResult.setTingLi(result.getTingLiZuo() + "/" + result.getTingLiYou());
  2038 + if (result.getShiLiZuo() != null || result.getShiLiYou() != null)
  2039 + {
  2040 + checkupResult.setShiLi(result.getShiLiZuo() + "/" + result.getShiLiYou());
  2041 + }
  2042 + //听力
  2043 + if (result.getTingLiZuo() != null || result.getTingLiYou() != null)
  2044 + {
  2045 + checkupResult.setTingLi(result.getTingLiZuo() + "/" + result.getTingLiYou());
  2046 + }
2042 2047  
2043 2048  
  2049 +
2044 2050 //辨色能力(1: 异常 2: 正常)
2045 2051 String bianSe = "";
2046 2052 if (result.getBianSe() != null && result.getJiZhu() == 1)
2047 2053  
2048 2054  
2049 2055  
2050 2056  
2051 2057  
... ... @@ -2063,107 +2069,117 @@
2063 2069 checkupResult.setBianSe(bianSe);
2064 2070  
2065 2071 //甲状腺(1: 异常 2: 正常)
2066   - String jiaZhuangXian = "";
  2072 + checkupResult.setJiaZhuangXian(itemHandle(result.getJiaZhuangXian(),result.getJiaZhuangXianDetails()));
  2073 + checkupResult.setXiongKuo(itemHandle(result.getXiongKuo(), result.getXiongKuoDetails()));
  2074 + checkupResult.setFei(itemHandle(result.getFei(), result.getFeiDetails()));
  2075 + checkupResult.setHeartRate(UnitHandle(result.getHeartRate(),UnitConstants.CIFEN));
  2076 + checkupResult.setHeartRhythm(StringUtils.isNotEmpty(result.getHeartRhythm()) ? result.getHeartRhythm() : "");
  2077 + checkupResult.setZaYin(itemHandle(result.getZaYin(), result.getZaYinDetails()));
  2078 + checkupResult.setGan(result.getGan());
  2079 + checkupResult.setPi(result.getPi());
  2080 + checkupResult.setTiGeQiTa(result.getTiGeQiTa());
2067 2081  
2068   - checkupResult.setJiaZhuangXian(jiaZhuangXian);
2069   -//
2070   -// //胸廓(1: 异常 2: 正常)
2071   -// private String xiongKuo;
2072   -//
2073   -// //肺(1: 异常 2: 正常)
2074   -// private String fei;
2075   -//
2076   -// //心率
2077   -// private String heartRate;
2078   -//
2079   -// //心律
2080   -// private String heartRhythm;
2081   -//
2082   -// //杂音(1: 异常 2: 正常)
2083   -// private String zaYin;
2084   -//
2085   -// //肝
2086   -// private String gan;
2087   -// //脾
2088   -// private String pi;
2089   -// //体格检查其他
2090   -// private String tiGeQiTa;
  2082 + checkupResult.setTiTai(itemHandle(result.getTiTai(), result.getTiTaiDetails()));
2091 2083  
  2084 + //男性
  2085 + checkupResult.setHouJie(itemHandle(result.getHouJie(), result.getHouJieDetails()));
  2086 + checkupResult.setRuXianNvXingHua(itemHandle(result.getRuXianNvXingHua(), result.getRuXianNvXingHuaDetails()));
  2087 + //阴毛(1: 正常 2: 无 3: 稀少)
  2088 + String yinmao = "";
  2089 + if (result.getYinMao() != null)
  2090 + {
  2091 + if (result.getYinMao() == 1)
  2092 + {
  2093 + yinmao = "正常";
  2094 + }
  2095 + else if (result.getYinMao() == 2)
  2096 + {
  2097 + yinmao = "无";
  2098 + }
  2099 + else if (result.getYinMao() == 3)
  2100 + {
  2101 + yinmao = "稀少";
  2102 + }
  2103 + }
  2104 + checkupResult.setYinMao(yinmao);
2092 2105  
2093   -// checkupResult.setMaritalHistory(result.getMaritalHistory());
2094   -// checkupResult.setSangOu(result.getSangOu());
2095   -// checkupResult.setLiYi(result.getLiYi());
2096   -// checkupResult.setChildrenNum(result.getChildrenNum());
2097   -// checkupResult.setNextOfKin(result.getNextOfKin());
2098   -// checkupResult.setParents(result.getParents());
2099   -// checkupResult.setGrandparent(result.getGrandparent());
2100   -// checkupResult.setMaternalGrandparents(result.getMaternalGrandparents());
2101   -//
2102   -// checkupResult.setJingShenZhuangTai(result.getJingShenZhuangTai());
2103   -// checkupResult.setJingShenZhuangTaiDetails(result.getJingShenZhuangTaiDetails());
2104   -// checkupResult.setYuYanNengLi(result.getYuYanNengLi());
2105   -// checkupResult.setYuYanNengLiDetails(result.getYuYanNengLiDetails());
2106   -//
2107   -// checkupResult.setTeShuMianRong(result.getTeShuMianRong());
2108   -// checkupResult.setTeShuMianRongDetails(result.getTeShuMianRongDetails());
2109   -// checkupResult.setTeShuTiTai(result.getTeShuTiTai());
2110   -// checkupResult.setTeShuTiTaiDetails(result.getTeShuTiTaiDetails());
2111   -//
2112   -// checkupResult.setHeight(result.getHeight());
2113   -// checkupResult.setWeight(result.getWeight());
2114   -// checkupResult.setBp(result.getBp());
2115   -//
2116   -// checkupResult.setPiFu(result.getPiFu());
2117   -// checkupResult.setPiZheng(result.getPiZheng());
2118   -// checkupResult.setBiHan(result.getBiHan());
2119   -// checkupResult.setGanJue(result.getGanJue());
2120   -// checkupResult.setMaoFa(result.getMaoFa());
2121   -//
2122   -// checkupResult.setFenBu(result.getFenBu());
2123   -// checkupResult.setYanSe(result.getYanSe());
2124   -// checkupResult.setBuWei(result.getBuWei());
2125   -// checkupResult.setSiZhi(result.getSiZhi());
2126   -// checkupResult.setJiWeiSuo(result.getJiWeiSuo());
2127   -// checkupResult.setMaBi(result.getMaBi());
2128   -// checkupResult.setJingLuan(result.getJingLuan());
2129   -// checkupResult.setZhengChan(result.getZhengChan());
2130   -// checkupResult.setSiZhiQiTa(result.getSiZhiQiTa());
2131   -// checkupResult.setSiZhiQiTaDetails(result.getSiZhiQiTaDetails());
2132   -// checkupResult.setJiZhu(result.getJiZhu());
2133   -// checkupResult.setJiZhuDetails(result.getJiZhuDetails());
2134   -// checkupResult.setQianBiaoLinBaJie(result.getQianBiaoLinBaJie());
2135   -// checkupResult.setShiLiZuo(result.getShiLiZuo());
2136   -// checkupResult.setShiLiYou(result.getShiLiYou());
2137   -//
2138   -// checkupResult.setTingLiZuo(result.getTingLiZuo());
2139   -// checkupResult.setTingLiYou(result.getTingLiYou());
2140   -// checkupResult.setBianSe(result.getBianSe());
2141   -// checkupResult.setBianSeDetails(result.getBianSeDetails());
2142   -//
2143   -// checkupResult.setJiaZhuangXian(result.getJiaZhuangXian());
2144   -// checkupResult.setJiaZhuangXianDetails(result.getJiaZhuangXianDetails());
2145   -// checkupResult.setXiongKuo(result.getXiongKuo());
2146   -// checkupResult.setXiongKuoDetails(result.getXiongKuoDetails());
2147   -// checkupResult.setFei(result.getFei());
2148   -// checkupResult.setFeiDetails(result.getFeiDetails());
2149   -// checkupResult.setHeartRate(result.getHeartRate());
2150   -// checkupResult.setHeartRhythm(result.getHeartRhythm());
2151   -// checkupResult.setZaYin(result.getZaYin());
2152   -// checkupResult.setZaYinDetails(result.getZaYinDetails());
2153   -// checkupResult.setGan(result.getGan());
2154   -// checkupResult.setPi(result.getPi());
2155   -// checkupResult.setTiGeQiTa(result.getTiGeQiTa());
  2106 + if (StringUtils.isNotEmpty(result.getjBa()))
  2107 + {
  2108 + //男性生殖器
  2109 + checkupResult.setjBa(itemHandle(Integer.valueOf(result.getjBa()), result.getjBaDetails()));
  2110 + }
2156 2111  
2157   -// checkupResult.setTiTai(result.getTiTai());
2158   -// checkupResult.setTiTaiDetails(result.getTiTaiDetails());
2159   -// checkupResult.setRuFangFaYu(result.getRuFangFaYu());
2160   -// checkupResult.setRuFangFaYuDetails(result.getRuFangFaYuDetails());
2161   -// checkupResult.setYinMao(result.getYinMao());
2162   -// checkupResult.setHouJie(result.getHouJie());
2163   -// checkupResult.setHouJieDetails(result.getHouJieDetails());
2164   -// checkupResult.setRuXianNvXingHua(result.getRuXianNvXingHua());
2165   -// checkupResult.setRuXianNvXingHuaDetails(result.getRuXianNvXingHuaDetails());
  2112 + //包皮(1: 正常 2：过长 3：包茎 )
  2113 + String baopi = "";
  2114 + if (result.getBaoPi() != null)
  2115 + {
  2116 + if (result.getBaoPi() == 1)
  2117 + {
  2118 + baopi = "正常";
  2119 + }
  2120 + else if (result.getBaoPi() == 2)
  2121 + {
  2122 + baopi = "过长";
  2123 + }
  2124 + else if (result.getBaoPi() == 3)
  2125 + {
  2126 + baopi = "包茎";
  2127 + }
  2128 + }
  2129 + checkupResult.setBaoPi(baopi);
2166 2130  
  2131 + //睾丸(单选，选择1扪及/2未们及)
  2132 + String gaowan = "";
  2133 + if (result.getGaoWan() != null) {
  2134 + String zuo = result.getGaoWanZuo()==null ? "" :result.getGaoWanZuo();
  2135 + String you = result.getGaoWanYou()==null ? "" :result.getGaoWanYou();
  2136 + if (result.getGaoWan() == 1)
  2137 + {
  2138 +
  2139 + gaowan = "扪及"+"(左 "+zuo + "/右 "+you+")";
  2140 + }
  2141 + else if (result.getGaoWan() == 2)
  2142 + {
  2143 + gaowan = "未扪及"+"(左 "+zuo + "/右 "+you+")";
  2144 + }
  2145 + }
  2146 + checkupResult.setGaoWan(gaowan);
  2147 +
  2148 + //附睾
  2149 + String fugao = "";
  2150 + if (result.getFuGao() != null) {
  2151 + String zuo = result.getFuGaoZuo()==null ? "" :result.getFuGaoZuo();
  2152 + String you = result.getFuGaoYou()==null ? "" :result.getFuGaoYou();
  2153 + if (result.getFuGao() == 1)
  2154 + {
  2155 + fugao = "正常";
  2156 + }
  2157 + else if (result.getFuGao() == 2)
  2158 + {
  2159 + fugao = "结节"+"(左 "+zuo + "/右 "+you+")";
  2160 + }
  2161 + }
  2162 + checkupResult.setFuGao(fugao);
  2163 +
  2164 + //精索静脉曲张
  2165 + String jingMai = "";
  2166 + if (result.getJingMai() != null) {
  2167 + String zuo = result.getJingMaiZuo()==null ? "" :result.getJingMaiZuo();
  2168 + String you = result.getJingMaiYou()==null ? "" :result.getJingMaiYou();
  2169 + if (result.getJingMai() == 1)
  2170 + {
  2171 + jingMai = "无";
  2172 + }
  2173 + else if (result.getJingMai() == 2)
  2174 + {
  2175 + jingMai = "有"+"(左 "+zuo + "/右 "+you+")";
  2176 + }
  2177 + }
  2178 + checkupResult.setJingMai(jingMai);
  2179 + checkupResult.setShengZhiQiTa(result.getShengZhiQiTa());
  2180 +
  2181 + //女性生殖器
  2182 + checkupResult.setRuFangFaYu(itemHandle(result.getRuFangFaYu(), result.getRuFangFaYuDetails()));
2167 2183 checkupResult.setGcWaiYin(result.getGcWaiYin());
2168 2184 checkupResult.setGcFenMiWu(result.getGcFenMiWu());
2169 2185 checkupResult.setGcZiGong(result.getGcZiGong());
2170 2186  
2171 2187  
2172 2188  
2173 2189  
2174 2190  
2175 2191  
... ... @@ -2176,60 +2192,105 @@
2176 2192 checkupResult.setFuJian(result.getFuJian());
2177 2193 checkupResult.setYinDaoQiTa(result.getYinDaoQiTa());
2178 2194  
2179   -// checkupResult.setjBa(result.getjBa());
2180   -// checkupResult.setjBaDetails(result.getjBaDetails());
2181   -// checkupResult.setBaoPi(result.getBaoPi());
2182   -// checkupResult.setGaoWan(result.getGaoWan());
2183   -// checkupResult.setGaoWanZuo(result.getGaoWanZuo());
2184   -// checkupResult.setGaoWanYou(result.getGaoWanYou());
2185   -// checkupResult.setFuGao(result.getFuGao());
2186   -// checkupResult.setFuGaoZuo(result.getFuGaoZuo());
2187   -// checkupResult.setFuGaoYou(result.getFuGaoYou());
2188   -// checkupResult.setJingMai(result.getJingMai());
2189   -// checkupResult.setJingMaiZuo(result.getJingMaiZuo());
2190   -// checkupResult.setJingMaiYou(result.getJingMaiYou());
2191   -// checkupResult.setShengZhiQiTa(result.getShengZhiQiTa());
2192   -
2193   - checkupResult.setXueHongDanBai(result.getXueHongDanBai());
2194   - checkupResult.setBaiXiBao(result.getBaiXiBao());
2195   - checkupResult.setXueXiaoBan(result.getXueXiaoBan());
  2195 + //血常规
  2196 + checkupResult.setXueHongDanBai(UnitHandle(result.getXueHongDanBai(), UnitConstants.GL));
  2197 + checkupResult.setBaiXiBao(UnitHandle(result.getBaiXiBao(), UnitConstants.TEN_LKG));
  2198 + checkupResult.setXueXiaoBan(UnitHandle(result.getXueXiaoBan(), UnitConstants.TEN_LKG));
2196 2199 checkupResult.setXueChangGuiQiTa(result.getXueChangGuiQiTa());
  2200 +
  2201 + //尿常规
2197 2202 checkupResult.setNiaoDanBai(result.getNiaoDanBai());
2198 2203 checkupResult.setNiaoTang(result.getNiaoTang());
2199 2204 checkupResult.setNiaoTongTi(result.getNiaoTongTi());
2200 2205 checkupResult.setNiaoQianXue(result.getNiaoQianXue());
2201 2206 checkupResult.setNiaoChangGuiQiTa(result.getNiaoChangGuiQiTa());
2202   - checkupResult.setXueXing(result.getXueXing());
2203   - checkupResult.setRhxueXing(result.getRhxueXing());
2204   - checkupResult.setXueTang(result.getXueTang());
2205   - checkupResult.setXueQingGuBing(result.getXueQingGuBing());
2206   - checkupResult.setXueQingGuCao(result.getXueQingGuCao());
2207   - checkupResult.setXueDanBai(result.getXueDanBai());
2208   - checkupResult.setZongDanHongSu(result.getZongDanHongSu());
2209   - checkupResult.setJieHeDanHongSu(result.getJieHeDanHongSu());
2210   - checkupResult.setBingGan(result.getBingGan());
2211   - checkupResult.setYiGanKangYuan(result.getYiGanKangYuan());
2212   - checkupResult.setYiGanKangTi(result.getYiGanKangTi());
2213   - checkupResult.setYiGanEKangYuan(result.getYiGanEKangYuan());
2214   - checkupResult.setYiGanEKangTi(result.getYiGanEKangTi());
2215   - checkupResult.setYiGanHeXinKangTi(result.getYiGanHeXinKangTi());
2216   - checkupResult.setXueQingJiGan(result.getXueQingJiGan());
2217   - checkupResult.setXueNiaoSuDan(result.getXueNiaoSuDan());
2218   - checkupResult.setShiYanJieGuo(result.getShiYanJieGuo());
2219   - checkupResult.setHiv(result.getHiv());
  2207 +
  2208 + //血型
  2209 + checkupResult.setXueXing(getBaseicConfigByid(result.getXueXing()));
  2210 + checkupResult.setRhxueXing(handleYY(result.getRhxueXing()));
  2211 + checkupResult.setXueTang(UnitHandle(result.getXueTang(), UnitConstants.MMOLL));
  2212 +
  2213 + //肝功能
  2214 + checkupResult.setXueQingGuBing(UnitHandle(result.getXueQingGuBing(), UnitConstants.UL));
  2215 + checkupResult.setXueQingGuCao(UnitHandle(result.getXueQingGuCao(), UnitConstants.UL));
  2216 + checkupResult.setXueDanBai(UnitHandle(result.getXueDanBai(), UnitConstants.GL));
  2217 + checkupResult.setZongDanHongSu(UnitHandle(result.getZongDanHongSu(), UnitConstants.UMOLL));
  2218 + checkupResult.setJieHeDanHongSu(UnitHandle(result.getJieHeDanHongSu(), UnitConstants.UMOLL));
  2219 + checkupResult.setBingGan(handleYY(result.getBingGan()));
  2220 +
  2221 + //乙肝五项
  2222 + checkupResult.setYiGanKangYuan(handleYY(result.getYiGanKangYuan()));
  2223 + String yiGanKangTi = "";
  2224 + if ("yin".equals(result.getYiGanKangTi()))
  2225 + {
  2226 + yiGanKangTi = "-";
  2227 + }
  2228 + else if ("ruoyang".equals(result.getYiGanKangTi()))
  2229 + {
  2230 + yiGanKangTi = "±";
  2231 + }
  2232 + else if ("yang".equals(result.getYiGanKangTi()))
  2233 + {
  2234 + yiGanKangTi = "+";
  2235 + }
  2236 + checkupResult.setYiGanKangTi(yiGanKangTi);
  2237 + checkupResult.setYiGanEKangYuan(handleYY(result.getYiGanEKangYuan()));
  2238 + checkupResult.setYiGanEKangTi(handleYY(result.getYiGanEKangTi()));
  2239 + checkupResult.setYiGanHeXinKangTi(handleYY(result.getYiGanHeXinKangTi()));
  2240 +
  2241 + //肾功能
  2242 + checkupResult.setXueQingJiGan(UnitHandle(result.getXueQingJiGan(), UnitConstants.UL));
  2243 + checkupResult.setXueNiaoSuDan(UnitHandle(result.getXueNiaoSuDan(), UnitConstants.UL));
  2244 +
  2245 + //梅毒血清实验
  2246 + checkupResult.setShiYanJieGuo(handleYY(result.getShiYanJieGuo()));
  2247 + checkupResult.setHiv(handleYY(result.getHiv()));
  2248 + //淋病筛查
2220 2249 checkupResult.setLinBing(result.getLinBing());
  2250 + //影像检查
2221 2251 checkupResult.setXiongTou(result.getXiongTou());
2222   -// checkupResult.setJianChaJieGuo(result.getJianChaJieGuo());
2223   -// checkupResult.setJianChaDetails(result.getJianChaDetails());
2224   -// checkupResult.setJiBingZhenDuan(result.getJiBingZhenDuan());
2225   -// checkupResult.setYiXueYiJian(result.getYiXueYiJian());
2226   -// checkupResult.setYiJianQiTaDetails(result.getYiJianQiTaDetails());
2227   -// checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
2228 2252  
  2253 + //检查结果
  2254 + String jcjg = "";
  2255 + if (result.getJianChaJieGuo() != null && result.getJianChaJieGuo() == 1)
  2256 + {
  2257 + jcjg = "正常";
  2258 + }
  2259 + else if (result.getJianChaJieGuo() != null && result.getJianChaJieGuo() == 2)
  2260 + {
  2261 + jcjg = "异常";
  2262 + }
  2263 + checkupResult.setJianChaJieGuo(jcjg);
  2264 + checkupResult.setJianChaDetails(result.getJianChaDetails());
  2265 + checkupResult.setJiBingZhenDuan(result.getJiBingZhenDuan());
  2266 +
  2267 + //医学意见
  2268 + String yxyj = "";
  2269 + if (result.getYiXueYiJian() != null)
  2270 + {
  2271 + if (result.getYiXueYiJian() == 1)
  2272 + {
  2273 + yxyj = "符合结婚的医学条件";
  2274 + }
  2275 + else if (result.getYiXueYiJian() == 2)
  2276 + {
  2277 + yxyj = "建议暂缓结婚";
  2278 + }
  2279 + else if (result.getYiXueYiJian() == 3)
  2280 + {
  2281 + yxyj = "建议采取长效或永久性避孕措施后可以结婚";
  2282 + }
  2283 + else if (result.getYiXueYiJian() == 4)
  2284 + {
  2285 + yxyj = result.getYiJianQiTaDetails();
  2286 + }
  2287 + }
  2288 + checkupResult.setYiXueYiJian(yxyj);
  2289 + checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
2229 2290 return checkupResult;
2230 2291 }
2231 2292  
2232   - private static String strPj(String dstStr,String str)
  2293 + private String strPj(String dstStr,String str)
2233 2294 {
2234 2295 String result = "";
2235 2296 if (StringUtils.isNotEmpty(str))
2236 2297  
2237 2298  
... ... @@ -2273,10 +2334,28 @@
2273 2334 return result;
2274 2335 }
2275 2336  
2276   - public static void main(String[] args)
  2337 + private String handleYY(String yy)
2277 2338 {
2278   - String str = strPj("","ccc");
2279   - System.out.println(str);
  2339 + String result = "";
  2340 + if ("yang".equals(yy))
  2341 + {
  2342 + result = "+";
  2343 + }
  2344 + else if ("yin".equals(yy))
  2345 + {
  2346 + result = "-";
  2347 + }
  2348 + return result;
2280 2349 }
  2350 +
  2351 + private String UnitHandle(String value,String unit)
  2352 + {
  2353 + if (StringUtils.isNotEmpty(value))
  2354 + {
  2355 + return value+ unit;
  2356 + }
  2357 + return "";
  2358 + }
  2359 +
2281 2360 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ f07e62f
... ... @@ -1651,6 +1651,12 @@
1651 1651 model.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
1652 1652 model.setCheckMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate()));
1653 1653  
  1654 + if (checkModel.getNextDate() != null && babyModel.getBirth() != null)
  1655 + {
  1656 + model.setNextCheckMonthAge(DateUtil.getBabyAgeMonth(babyModel.getBirth(), checkModel.getNextDate())+"月龄");
  1657 + }
  1658 +
  1659 +
1654 1660 String buildDiagnose = "";
1655 1661  
1656 1662 String buildDiagnoseStr = checkModel.getDiagnose();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ f07e62f
... ... @@ -61,7 +61,10 @@
61 61 //下次预约检查
62 62 private String nextCheckDate;
63 63  
  64 + //下次检查月龄
  65 + private String nextCheckMonthAge;
64 66  
  67 +
65 68 /******儿保保键****/
66 69  
67 70 //主要抚养人
... ... @@ -503,6 +506,14 @@
503 506  
504 507 public String getGrowthEvaluate() {
505 508 return growthEvaluate;
  509 + }
  510 +
  511 + public String getNextCheckMonthAge() {
  512 + return nextCheckMonthAge;
  513 + }
  514 +
  515 + public void setNextCheckMonthAge(String nextCheckMonthAge) {
  516 + this.nextCheckMonthAge = nextCheckMonthAge;
506 517 }
507 518  
508 519 public void setGrowthEvaluate(String growthEvaluate) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java View file @ f07e62f
... ... @@ -26,6 +26,7 @@
26 26 public static final String FZ = " 分钟";
27 27 public static final String GE = " 个";
28 28 public static final String SUI = " 岁";
  29 + public static final String REN = " 人";
29 30  
30 31  
31 32 }