Commit 3b7176ca81afa798b53d383417413bf6e7ea4c89

Authored by yangfei

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 3b7176c
... ... @@ -1968,10 +1968,17 @@
1968 1968 return br;
1969 1969 }
1970 1970  
1971   - @RequestMapping(value="/zc/cs")
  1971 + @RequestMapping(value="/zc/fz")
1972 1972 @ResponseBody
1973   - public BaseObjectResponse getCs(@RequestParam("startDate")String startDate,@RequestParam("endDate")String endDate){
1974   - BaseObjectResponse br = zcPrenatalService.saveFuZhen(startDate,endDate);
  1973 + public BaseObjectResponse getcz(@RequestParam("startDate")String startDate,@RequestParam("endDate")String endDate){
  1974 + BaseObjectResponse br = zcPrenatalService.saveChuZhen(startDate, endDate);
  1975 + return br;
  1976 + }
  1977 +
  1978 + @RequestMapping(value="/zc/cz")
  1979 + @ResponseBody
  1980 + public BaseObjectResponse getfz(@RequestParam("startDate")String startDate,@RequestParam("endDate")String endDate){
  1981 + BaseObjectResponse br = zcPrenatalService.saveFuZhen(startDate, endDate);
1975 1982 return br;
1976 1983 }
1977 1984  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 3b7176c
... ... @@ -678,7 +678,7 @@
678 678 sieveResultEditInfo.put("sbstValue",model.getSbstValue());
679 679 sieveResultEditInfo.put("stzhz13Value",model.getStzhz13Value());
680 680 sieveResultEditInfo.put("sjgjxValue",model.getSjgjxValue());
681   - sieveResultEditInfo.put("sjgjxValue",model.getPublishName());
  681 + sieveResultEditInfo.put("publishName",model.getPublishName());
682 682 }
683 683 map.put("sieveResultEditInfo",sieveResultEditInfo);
684 684 }