jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 594a54ecadc421bac58dd82dbe2da611609cc35c

Authored by jiangjiazhi
2 parents ca75187f4a 6ed58f88cc
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java View file @ 594a54e
... ... @@ -34,7 +34,7 @@
34 34 */
35 35 @RequestMapping(value = "/findAntExChuData",method = RequestMethod.GET)
36 36 @ResponseBody
37   -// @TokenRequired
  37 + @TokenRequired
38 38 public BaseObjectResponse findAntExChuData(@RequestParam("id")String id,
39 39 HttpServletRequest request){
40 40 BaseObjectResponse br = viewFacade.findAntExChu(id);
... ... @@ -50,7 +50,7 @@
50 50 */
51 51 @RequestMapping(value = "/findAntenatalExaminationData",method = RequestMethod.GET)
52 52 @ResponseBody
53   -// @TokenRequired
  53 + @TokenRequired
54 54 public BaseObjectResponse findAntenatalExaminationData(@RequestParam("id")String id,
55 55 HttpServletRequest request){
56 56  
... ... @@ -64,7 +64,7 @@
64 64 */
65 65 @RequestMapping(value = "/findMatDeliverData", method = RequestMethod.GET)
66 66 @ResponseBody
67   -// @TokenRequired
  67 + @TokenRequired
68 68 public BaseObjectResponse findMatDeliverData(@RequestParam("id")String id){
69 69 return viewFacade.findMatDeliverData(id);
70 70 }
... ... @@ -76,7 +76,7 @@
76 76 */
77 77 @RequestMapping(value = "/findPatientData", method = RequestMethod.GET)
78 78 @ResponseBody
79   -// @TokenRequired
  79 + @TokenRequired
80 80 public BaseObjectResponse findPatientData(@RequestParam("id")String id){
81 81 return viewFacade.findPatientData(id);
82 82 }
... ... @@ -88,7 +88,7 @@
88 88 */
89 89 @RequestMapping(value = "/findPostReviewData", method = RequestMethod.GET)
90 90 @ResponseBody
91   -// @TokenRequired
  91 + @TokenRequired
92 92 public BaseObjectResponse findPostReviewData(@RequestParam("id")String id){
93 93 return viewFacade.findPostReviewData(id);
94 94 }
... ... @@ -100,7 +100,7 @@
100 100 */
101 101 @RequestMapping(value = "/findDischargeAbstractData", method = RequestMethod.GET)
102 102 @ResponseBody
103   -// @TokenRequired
  103 + @TokenRequired
104 104 public BaseObjectResponse findDischargeAbstractData(@RequestParam("id")String id){
105 105 return viewFacade.findDischargeAbstractData(id);
106 106 }
... ... @@ -112,7 +112,7 @@
112 112 */
113 113 @RequestMapping(value = "/findStopPregData", method = RequestMethod.GET)
114 114 @ResponseBody
115   -// @TokenRequired
  115 + @TokenRequired
116 116 public BaseObjectResponse findStopPregData(@RequestParam("id")String id){
117 117 return viewFacade.findStopPregData(id);
118 118 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java View file @ 594a54e
... ... @@ -43,6 +43,11 @@
43 43 content.put("cqzdyx", "产前诊断阳性");
44 44 }
45 45  
  46 + /**
  47 + * 解析终止妊娠
  48 + * @param map
  49 + * @return
  50 + */
46 51 public static String replaceStopPreg(Map map) {
47 52 if (null == map) {
48 53 return "";
... ... @@ -136,7 +141,12 @@
136 141 return "";
137 142 }
138 143  
139   - //解析阴道分泌物字段
  144 + /**
  145 + * 解析阴道分泌物字段
  146 + * @param map
  147 + * @param type 1,返回阴道分泌物2,返回阴道清洁度
  148 + * @return
  149 + */
140 150 public static String replaceYDFMW(Map map,Integer type) {
141 151 if (map==null){
142 152 return null;
... ... @@ -260,6 +270,7 @@
260 270 return highScoreResult;
261 271 }
262 272  
  273 + //其他高危
263 274 public static Map queryOtherRisk(String otherHighRisk,Map<String,Object>map,BasicConfigService basicConfigService){
264 275 if (StringUtils.isEmpty(otherHighRisk)){
265 276 return map;
... ... @@ -292,6 +303,8 @@
292 303 return map;
293 304 }
294 305  
  306 +
  307 + //解析高危,返回名字和颜色
295 308 public static List<Map<String,Object>> queryHighRisk(HighScoreResult result){
296 309  
297 310 if (result==null){