Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@@ -690,6 +690,11 @@ public class PrescriptionInfoService extends BaseService {
        List<Map<String,Object>> states = new ArrayList<>();
        Map<String,Object> map0 = new HashMap<>();
        map0.put("name","续方申请通过");
        map0.put("code",PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue());
        states.add(map0);
        Map<String,Object> map1 = new HashMap<>();
        map1.put("name","订单已支付");
        map1.put("code",PrescriptionLog.PrescriptionLogStatus.pay_success.getValue());
@@ -711,9 +716,9 @@ public class PrescriptionInfoService extends BaseService {
        states.add(map4);
        Map<String,Object> map5 = new HashMap<>();
        map2.put("name","配药完成");
        map2.put("code",PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map2);
        map5.put("name","配送完成");
        map5.put("code",PrescriptionLog.PrescriptionLogStatus.finish.getValue());
        states.add(map5);
        //设置配送状态下拉框
        rs.put("states",states);
@@ -778,8 +783,8 @@ public class PrescriptionInfoService extends BaseService {
            param.add("%"+nameKey+"%");
        }
        if(StringUtils.isNotBlank(teamCode)){
            pre_sql.append(" AND p.admin_team_id = ? ");
            param.add("%"+teamCode+"%");
            pre_sql.append(" AND pr.admin_team_id = ? ");
            param.add(teamCode);
        }
        if(StringUtils.isNotBlank(startDate)){
            pre_sql.append(" AND pr.create_time >= ? ");
@@ -815,12 +820,15 @@ public class PrescriptionInfoService extends BaseService {
    }
    public JSONObject getCountExpressage(String teamCode){
        StringBuffer pre_sql = new StringBuffer("SELECT　count(1) AS count FROM  " +
                "  wlyy_prescription pr " +
                "  JOIN wlyy_prescription_expressage e ON pr.code = e.prescription_code " +
                "  WHERE pr.admin_team_id = ? "+
                "  AND pr.dispensary_type =3" +
                "  AND e.expressage_code IS NULL");
        StringBuffer pre_sql = new StringBuffer("SELECT " +
                " count(1) AS count  " +
                " FROM " +
                " wlyy_prescription pr " +
                " JOIN wlyy_prescription_expressage e ON pr. CODE = e.prescription_code  " +
                " WHERE " +
                " pr.admin_team_id = ? " +
                " AND pr.dispensary_type = 3 " +
                " AND e.expressage_code IS NULL");
        List<Map<String,Object>> list = jdbcTemplate.queryForList(pre_sql.toString(),new Object[]{teamCode});
        if(list!=null&&list.size()>0){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -230,7 +230,7 @@ public class PrescriptionInfoController extends BaseController{
                                                  @RequestParam(required = false) @ApiParam(value = "机构", name = "hospital")String hospital,
                                                  @RequestParam(required = false) @ApiParam(value = "配送状态", name = "state")String state,
                                                  @RequestParam(required = false) @ApiParam(value = "配送方式:1 自取 2快递配送 3健管师配送", name = "dispensaryType")String dispensaryType,
                                                  @RequestParam(required = false) @ApiParam(value = "未分配健管师", name = "传1为未分配健管师")String AllocationType,
                                                  @RequestParam(required = false) @ApiParam(value = "传1为未分配健管师", name = "AllocationType")String AllocationType,
                                                  @RequestParam(required = false) @ApiParam(value = "起始页", name = "page")Integer page,
                                                  @RequestParam(required = false) @ApiParam(value = "每页大小", name = "size")Integer size){
        try {
@@ -290,7 +290,7 @@ public class PrescriptionInfoController extends BaseController{
        }
    }
    @RequestMapping(value = "/distributionHealthDoctor", method = RequestMethod.GET)
    @RequestMapping(value = "/distributionHealthDoctor", method = RequestMethod.POST)
    @ApiOperation(value = "配置建管师")
    public String distributionHealthDoctor(@RequestParam(required = true) @ApiParam(value = "续方Code字符串用','分割", name = "codes") String codes,
                                           @RequestParam(required = true) @ApiParam(value = "健康管理师Code", name = "healthDoctor")String healthDoctor){