Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -78,9 +78,10 @@ public class Prescription extends IdEntity {
    private String reviewedState;
    private String jwDeptCode;  //基卫-开处方的科室编码
    private String jwHospital;  //基卫-开处方的医院编码
    private String jwDoctorCode; //基卫-开方医生的编码
    private String jwGisterTypeCode;//基卫-挂号类型编码
    private String jwRateCode;//基卫-费别类型编码
    private String jwRateTypeCode;//基卫-费别类型编码
    @Column(name = "code", unique = true, nullable = false)
    public String getCode() {
@@ -596,11 +597,19 @@ public class Prescription extends IdEntity {
        this.jwGisterTypeCode = jwGisterTypeCode;
    }
    public String getJwRateCode() {
        return jwRateCode;
    public String getJwRateTypeCode() {
        return jwRateTypeCode;
    }
    public void setJwRateCode(String jwRateCode) {
        this.jwRateCode = jwRateCode;
    public void setJwRateTypeCode(String jwRateTypeCode) {
        this.jwRateTypeCode = jwRateTypeCode;
    }
    public String getJwHospital() {
        return jwHospital;
    }
    public void setJwHospital(String jwHospital) {
        this.jwHospital = jwHospital;
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/web/quota/JobController.java

@@ -370,7 +370,7 @@ public class JobController extends BaseController {
    }
    /**
     * 智业字典同步
     * 立即启动智业字典同步
     *
     * @Author chenweida
     * @params method
@@ -378,9 +378,9 @@ public class JobController extends BaseController {
     * @Date 2017/8/14 11:07
     * @Description:
     */
    @RequestMapping(value = "/zydictStartJob", method = RequestMethod.POST)
    @ApiOperation("智业字典同步")
    public String zydictStartJob() {
    @RequestMapping(value = "/zydictJobStartNow", method = RequestMethod.POST)
    @ApiOperation("立即启动智业字典同步")
    public String zydictJobStartNow() {
        try {
            quartzHelper.startNow(ZyDictJob.class, UUID.randomUUID().toString(), null);

patient-co/patient-co-wlyy-job/src/main/resources/banner.txt

@@ -1,23 +1,11 @@
${AnsiColor.BRIGHT_GREEN}
                                    ////////////////////////////////////////////////////////////////////
                                    //                          _ooOoo_                               //
                                    //                         o8888888o                              //
                                    //                         88" . "88                              //
                                    //                         (| ^_^ |)                              //
                                    //                         O\  =  /O                              //
                                    //                      ____/`---'\____                           //
                                    //                    .'  \\|     |//  `.                         //
                                    //                   /  \\|||  :  |||//  \                        //
                                    //                  /  _||||| -:- |||||-  \                       //
                                    //                  |   | \\\  -  /// |   |                       //
                                    //                  | \_|  ''\---/''  |   |                       //
                                    //                  \  .-\__  `-`  ___/-. /                       //
                                    //                ___`. .'  /--.--\  `. . ___                     //
                                    //              ."" '<  `.___\_<|>_/___.'  >'"".                  //
                                    //            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
                                    //            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
                                    //      ========`-.____`-.___\_____/___.-`____.-'========         //
                                    //                           `=---='                              //
                                    //      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
                                    //            佛祖保佑       永不宕机     永无BUG                 //
                                    ////////////////////////////////////////////////////////////////////
                     _                         _           _
                    | |                       (_)         | |
         __      __ | |  _   _   _   _         _    ___   | |__
         \ \ /\ / / | | | | | | | | | |       | |  / _ \  | '_ \
          \ V  V /  | | | |_| | | |_| |       | | | (_) | | |_) |
           \_/\_/   |_|  \__, |  \__, |       | |  \___/  |_.__/
                          __/ |   __/ |      _/ |
                         |___/   |___/      |__/

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -3279,7 +3279,7 @@ public class SignPatientLabelInfoService extends BaseService {
        String sql = "";
        Object[] args = null;
        if (labelType.equals("5")) {
        if ("5".equals(labelType)) {
            Calendar today = Calendar.getInstance();
            Calendar startDate = Calendar.getInstance();
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -3332,7 +3332,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    " f.ptOpenid DESC";
                args = new Object[]{teamCode};
        }else {
            if (labelCode.equals("0")) {
            if ("0".equals(labelCode)) {
                sql = "SELECT " +
                        "    DISTINCT  t1.* " +
                        " FROM " +
@@ -3346,7 +3346,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
                args = new Object[]{teamCode, labelType, teamCode};
            } else {
            } else if(!org.springframework.util.StringUtils.isEmpty(labelType)){
                sql = "SELECT " +
                        "    DISTINCT t1.* " +
                        " FROM " +
@@ -3361,6 +3361,17 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
                args = new Object[]{labelCode, labelType, teamCode};
            }else{
                //标签类别为空的时候
                sql = "SELECT " +
                        "    DISTINCT t1.* " +
                        " FROM " +
                        "    wlyy_sign_family t1 " +
                        " WHERE " +
                        "     t1.status > 0 " +
                        "    AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
                args = new Object[]{teamCode};
            }
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/ZyDictService.java

@@ -77,27 +77,17 @@ public class ZyDictService {
                " yp.physic_name drugName, " +
                " yp.physic_spec drugFormat, " +
                " yp.subject_class subjectClass, " +
                " yp.pack_unit packUnit, " +
                " yp.min_dose minDose, " +
                " yp.pake_spec pakeSpec, " +
                " class.class_name className, " +
                " yp.dose_unit physicDoseUnit, " +
                " com1.`name` physicDoseUnitName, " +
                " yp.quantity_unit drugNumUnit, " +
                " com2.`name` drugNumUnitName " +
                " FROM " +
                " ( " +
                "   SELECT " +
                "   * " +
                "   FROM " +
                "  zy_common_dict " +
                "   WHERE " +
                "    dict_name = 'IV_MEASURE_UNIT_DICT' " +
                " ) com1, " +
                " ( " +
                "   SELECT " +
                "    * " +
                "    FROM  " +
                "    zy_common_dict  " +
                "    WHERE " +
                "    dict_name = 'IV_MEASURE_UNIT_DICT' " +
                "  ) com2, " +
                " (SELECT code,name FROM zy_common_dict WHERE dict_name = 'IV_MEASURE_UNIT_DICT') com1, " +
                " (SELECT code,name FROM zy_common_dict WHERE dict_name = 'IV_MEASURE_UNIT_DICT') com2, " +
                "  zy_iv_subject_class_dict class,  " +
                "  (  " +
                "    SELECT  " +
@@ -107,6 +97,9 @@ public class ZyDictService {
                "   p.subject_class, " +
                "   p.dose_unit, " +
                "   p.quantity_unit " +
                "   p.pack_unit " +
                "   p.min_dose " +
                "   p.pake_spec " +
                "    FROM  " +
                "   zy_iv_physic_dict p, " +
                "  ( " +

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

@@ -234,7 +234,7 @@ public class SignPatientLabelInfoController extends BaseController {
            page = page > 0 ? page - 1 : 0;
            if (labelType.equals("9")) {
            if ("9".equals(labelType)) {
                JSONObject jsonObject = signWebService.getOverDuePatientsByTeam(labelCode, teamCode, page, pagesize);
                return write(200, "查询成功", "data", jsonObject);
            }
@@ -244,6 +244,7 @@ public class SignPatientLabelInfoController extends BaseController {
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1, "查询失败");
        }
    }